code clean up, optimizations of images
and moved images to the commit as well