Refactoring. Not sure what to say really.