Moved comment to the right place, use integer enums