More comments & formatting