minor changes ; code polishing
more changes for coding standards and cosmetics
minor