Cleanup

It's automatic so there probably isn't any bugs
Small simplifications
Using .NET 4.5
Cleaner to use String.Empty
Merge pull request #1 from Decagon/master

Cleanup