Tidy and fix.