Refactoring control booleans