Improve type naming, remove ununsed member variables
Correct bad variable name