#29: Wrap the short code methods in class
#29: Wrap the short code methods in class