1.refactor security
2.refactor utils