formatting to PSR1-2, fix typos