refactoring server-side MODEL
server-side refactoring
client-side refactoring
server-side refactoring