Fixed all the little annoyances to formatting