Refactor. Removing unnecessary code. Re-organizing structure slightly.