cleaned up some code after review