Polish code (make it simpler, not smarter)