Tidying up pull request.

Many thanks to Anahkiasen :)