Attempt to fix some formatting issues