#137 - code cleanup and documentation update