Clean up; const ints to enum