First successful run with images
Code cleanup
another commit after cleanup the code