Cleaned up a bunch of code and made it more readable

Also added a Xamarin.Android linked project file
Bumped nuspec with new changes