did some rearanging of methods as well as some comments