Updated variable names and method names