made enum non-static and corrected all references to the enum