more cleanup + readability changes