Refactor of everything.