Cleanup the whitespace here?