Removed those code smells