Merge this

Did formatting stuff