Minor cleanup
Add both types of finishes.