cleaned up some code and added some formatting