Updated some formatting and make nice nice