Fixing up formatting stuff