More Cleanup

Started to go over all files with the help of ReSharper.