Cleanup, creating armor enums