Fix code smell around Boolean usage, reserved name usage, and boxing

To make code more maintainable, we've started to use sonar to better pick up some of the small errors that might make the code harder to maintain.