misc code / comments clean up