Alignment tidy up
Corrected out of range enum indexing bug