angularized code
Cleaned up code
test data