Clean up with _.register(). Closes #2