Refactoring .images and .static to use