Updated files to latest framework version.
Tidied.