Refactoring and examples how we want them to be