some comment an cleanup