refactoring, removed regexp