Updated images and removed out commented code