code cleanup. separate codes to different files
Merge branch 'master' into st/housekeeping
Merge pull request #9 from shidel-dev/st/housekeeping

St/housekeeping