refactor 001-010

remove variables used only for loops etc
Merge pull request #3 from m-a-t-h/feature/001-010-refactor

refactor 001-010