Cleanup OOP and Reg-exp exercises