Latest Release Of App, Code Refactored And Cleaned