Code tidy up and started v2 fonts
Code prep to merge in master