Additional refactoring of class methods.
Merge pull request #29 from davidguerette/citrus_twist_display

Additional refactoring of class methods.