Split too big methods
#210

kylekatarnls wants to merge refactor into master

We do not currently have an analysis of these two commits