Refactoring of Dysco Class