restyle/reindent code from PR