Some code cleanup; converted a Prop to bool