refactor, use straight booleans