Clean-up stray vars/line wrap