Comments and removed unneeded lines