bit of cosmetic changes
Some refactoring; Per collection editors