Reduced code smells