Perform some refactoring