changed some names and removed unneccesary comments