simplified some member and method names