OOXML image cleanup and refactoring