Refactoring. Images loaded correctly.