Formatting issues fixed (hopefully)