Behold the grand refactor