More commenting. Code refining. Removed 'compose()' methods.