Code Clean Up #3

Format
- Added comments
- Removed some single lines
- Reorganized code