Refactor long lines (120+ characters)