[feature] Changed variables to use angular

Code cleanup