Adding more in-line documentation and some cleanup