add comment
clean up code
merge master