Fixing up formatting