This is the final cleanup of the codebase
- Added pragma-marks to the classes for more readability
- Reordered code in mainWindow in favour to the pragma-marks