cleanup and add comments