More clean-up and modernization