Refactor

Remove some duplicated functionality and make things a little easier
on the eyes. We're just about there!