Removed @@ and used attr_writer instead to shorten class and clean up code.