Removed duplications and unnecessary comments