smaller code modernizations