refactor: cleanup string literal variables handling