eliminated unnecessary class fields