Refactoring
Making progress.