Clean up + minor font improvements