Add comments & indent