Another small code polishing to try out CI triggering