Code refactoring

All code made by me now complies with Resharper and VS11 Code Analysis.
:-)