Tiny code style improvements (to try out CI triggering)
Another small code polishing to try out CI triggering