Cleanup and better docs