Cleanup (mostly style-related.)
Update docs