first pass at cleaning up images creation