More comments / cleanup