Separation of enumerations of the main class and cleaning a few variables.