code refactoring for submission
Add som picture