Clearup, added comments