Developing the Client Side - Refactoring the App