Comments and unnecessary lines removed