some refactoring
Merge pull request #1105 from ahmetmircik/someRefactoring

some refactoring