Add charset and tidy whitespace

Just doing this as an example of a pull request. Please accept my changes :)