Still refactoring
Progress towards more sustainable editing