Pre-changes
Add docco commments
Improve comments and code quality