Fixes more code smells