QUASAR: Some code cleanup, style guide stuff