Cleanup and visual tweaks

Here's a pull request. Merge it with your repo if you think it's okay. Cheers!