Small cleanup
Fix another function
Add take