Save current trial form step
Fix whitespace and indentation issues