cleanup. add comments