Minor updates for aesthetics