Extracted DISIS runner
Code inspection fixes