Cleanup and docs