Some aesthetic changes