Fixed loose ends
Using appropriate variable names