Properly fix #5 (missing import), formatting.