some minor high-quality-programming-code-related fixes