Refactor stuff.