More cleanup
Remove <<..>> interpolation (close #7)