A lot of general code quality improvements.