More avocado stuff; style tweaks