Improved type safety, swapped out built-in boolean for improved enum class type "SafeBoolean" in some cases