Minor cleanup after 2730e2b8de5dc1ef9de940ce67df9f8b0edaece7
   1. Remove unused scratch register from parameter list
   2. fix format issues