improved loading times of app
refactoring