more cleaning up
code simplification
Merge branch 'master' into json_decode