Bold flavor font and space clean up. #6616