Cleaned up emitting white space