added comments, cleaning