grasp refactor in if tests
more refactor, I like semicolons
more refactoring