Refactoring of dysco class