refactoring due to sonar hints, and reworked the loading screens