Updates after review
Reverted some auto-formatting stuff