Fix image storage
Use componentCount in helper
More storage type class clean up
Simplify and speed up
More clean up