angular refactor begun
angular refactor begun