angular refactoring
node refactoring