More cleanup + use 'newer' syntax where possible.