Refactoring after Web App came in