normalize styling across master and this branch