Moved most global vars to either enums or static consts in classes