Program is now more OO