helpers refactor
Merge pull request #26 from nullet/tidding_up_info

helpers refactor