Rearranging and extracting methods

Working to keep concepts at the same level of abstraction. Also
removing innane code comments. They were artifacts of the design
process and the method names *should* better reflect what is
happening.