Minor refactoring and rearranging; more examples