compositor style cleanups in prep for functional refactor