reindent declarations, fix typo