Cleaned Code

Update:
- Reformatted code for enhanced readability
- Removed unused/unneeded code