some aesthetic improvements