code smell cleanup