Made some elementary changes