Sprucing up and adding efficiency through classes