Using enums instead of booleans + Cosmetics