Remove font sizes, other tidying