fixed variable naming and method visibility