More formatting tweaks
Remap & to include flags

Closes #30.