cleanup code smell