better variable names
cleaning up defaults