Remove wishful-thinking comment about boolean logic
Refactor