some refactoring from StyleCop adding this. removing stupid comments. Rearange fields, properties, methods