restructures variables in Class/Constructor