convert my (and some old) changes to your coding style