Some functions are way too big, and need to be refactored

[glennsimon]

Many functions do too much, and are hard to debug. Refactor so functions are more specialized and potentially re-usable.