refactoring
Merge pull request #238 from web-patriot/small_refactoring

small refactoring