Some minor cleanup
Add core.async