Code enhancements, part 2