Remove some more code smells