More pointless refactors...