further refactoring

- fixed one missed + as concat usage
- using itertools.count instead of range
  this maked the code shorter and easyer to read