Merge pull request #1296 from timw4mail/library-cleanup

Library cleanup - adding additional docblocks