improve some formatting
move use after finalize to its own test