[feature] Changed variables to use angular

Code cleanup
Merge pull request #4 from alex-deaconu/master

[feature] Changed variables to use angular