Moved flag method to their own class