Minor style enhancements