More comments & formatting
More comments & formatting