Refactoring (remove singleton pattern, image format definition manipulations)