Refactor of work done so far.