Convert to OOP for Short code, #2