More sextractor refactoring