Misc changes

Made some misc changes to formatting
Misc changes

More misc changes