New version with removal of unnecessary codelines, and added comments