refactor whitespace expression
refactor goto statement