otw - Implemented several more best practices.