Refactor; fix big self whoopsie