New and Improved!

Hopefully it is now a bit cleaner :)