Added in some refactoring stuff