Cleanup of font code
More detail #6

Signed-off-by: Andrew Tennison <andrew@tennisons.com>