Refactor, reorganise, streamline.