Cleaning up emit method.

Also shorten on to one line