SQUASH ME: cleanup commit - mostly formatters