Updated some formatting and vars.