Improve readability. removed some member variables