Fix whitespace
Test: Port to new interface
Add some haddocks