Change defined constants to enum
Tidy up some mess
update ignore