Irrelevant changes.
Made it more modular.