Better variable names, and remove unnecessary semicolons