Cleaned up the code a little by including the namespace and formatting it. The namespace
shouldn't lead to problems as it's very localised.