refactor code
clean code repo
Merge branch 'master' of https://github.com/trungngv/nrpg-beta