clean up formatting and dev quirks