some cleanup/add comments