Refactored the flags into their own module