Clean up and typography change