fix final parameters, and indentation