Add discriptive variable names to class