Just a little reorganizing

Increased visibility of flags, amongst other things