Styling cleanups
Test and docs