Refactor code

[Charlie]

Rewrite bits of poorly structured logic and make sure that functional units make sense as units (and don't get too big)