Clean up some variable names and fmt