Polishing

Polishing comments and naming