Cleanup!

Static imports are quite nifty ;)