more cleanup and some styleing