code/comments clean up