Removed redundant return line; changed variable names