Mostly updating formatting and commenting