refactoring

small changes in all
Merge pull request #11 from iz56/feature

refactoring