clean up, add angularjs