Iniital Refactoring.
2 files changed