cleaned up some coding style choices