cleared all relevant Code smells