Cleanup and extend documentation