Code restructure. Better design.