Refactoring in preperation of update