trivial refactoring
block isn't required outside the if