Code cleanup

Lets convert these to boolean fields now.