made the loading proccess a bit cleaner