Lots of small code quality improvements to project.