Fixed some final formatting stuff