Removed bad code, Refactor and Refine the App