Cleanup
Cleanup elf
Use bitflags! macro from std