Better variable names, some aliasing