Add wrapping long strings & refactor