Removing code smells