Clean up some variables and typography