Bundle and Common file cleanup
- Added comments
- Renamed and reorganized some methods