Some aesthetic improvements