Moved comments into OOP version, added suggestion (comment)