Refactor: Classify, Methodify, DRY up.

Add a little structure to code with a few methods.