Ref #12 - Cleaned up docs and a little code