added some aesthetic improvements