Refactored Preloader further, short methods.
Clean up