Fix expand image;
Refactor;