Whitespace cleanups & removed the &nbsp;