Comments and error checking removal