Fix code indentation
A quick round of cleanups
Tidy up whitespace
Not a runsafe plugin - change package name.
Merge pull request #3 from mortenn/master

Just another round of cleanups..