formatting and cleanup of baseclient
merging upstream with local cleanup
Merge pull request #13 from thinkclay/master

Cleanup and Formatting fixes