Made some quality changes