Arrowhead 20140930 rc

Separate chunks of functionality into separate methods. Renamed and rewrote methods based on peer feedback.
Trailing whitespace detected.