Refactoring

Sorry, we're still building and haven't quite gotten to this subject yet.