Minor refactoring and added not to find examples