Fixing little code smells