clean code
fix member variable names