Code Cleanup

- Cleaned up the application code
- Added toast messages in a few locations to inform the user of actions