minor coding-style related fixes