Some coding style enhancements