More formatting of base.js