Application refactoring; Proper Data