[feature] Changed variables to use angular

Code cleanup

@stulees @tejohnso please review. Thanks.