Comments added, deleted unneccesary code