Lots of code cleanup, added ImageOptim