Refactoring, added some images