Common.js minor cleanup