More cleaning, moving to enums