Start moving logic into smaller methods

[#19]