some code quality amelioration