Applying tips by Dan Allen (https://twitter.com/mojavelinux/status/540949123906564096)