Modified variable names, and improved modules