cleaned up some code and added some new lines