More code smells
Merged