Updates to formatting and commenting