Fixing up some formatting issues