Let's stick to the original image size for now. Code cleanup.