Clean up code smell