Refactoring
cleanup
Add image
update