Code improvments

- Code improvment with StyleCop / ReSharper defaults
- Some  variable names changed
- Better code formatting

Feel free to test all unit tests.. All except 12 are working but I could
have used wrong settings in app.config