Tidied.
Updated copyright year.