Remove more code smells