other fixes, better style