add comment ad clean up code