Refactor some of the api classes after learing a bit about some clean code concepts.  Still a little more work to do in this regard but a good start.