Added proper variable names