Minor aesthetic changes to conform to standards