Cleaning code smells