re-factored with angular
Merge pull request #1 from Jimimimi/refactor

re-factored with angular