Make these changes now to save yourself further down the line.
None ...