Clean up of some of the source/header code. TODO: Cleanup the client
class.