follow conventions, fix typos, and remove whitespace