Finishing chair updates and cleaning code