Fixed some issues with spaces introduced during the initial paste.