Code tidy up and started v2 fonts