small code quality enhancements