Minor refactoring: change all Bool variables to True