Minor enhancements, mostly related to code style