Complete convert ShortCode to OOP