More consistent argument names, excess code cleanup