Removed @@ and used attr_reader to clean up code and shorten the class.