removed double assignments
Merge pull request #5 from Zeromax/patch-refactoring

removed double assignments