Refactoring. Bug Dont skip empty strings