did some editting of methods (making code look pretty. Still needs some work