Add image, refactor code