Refactor some stuff.