Make the application cleaner and remove redundant code
More restructuring and cleanup