Code cleanup

Better var naming and new image.