Clearnup, refactor, performance.