do some refactoring
Merge branch 'master' of https://github.com/cnt0/cfsubmit