cleaned up code and added dox