I agree with this approach, it will be much cleaner and less subject to future errors.