A few more aesthetic changes