Refactoring

Let's go through this.