Fixed Enum and added '_' for private variables