re-align commits
this commit is the prelude to a huge restyle