M6 Progress (3)

Cleaned things up in preperation for javadocs.