cleaned up some commented code