more refactoring
StringContext macro