refactoring

Just some JustCode refactoring andchanges according StyleCop