cleaning up style stuff a bit more