Fluent Refactoring

Code Smells