Clean up whitespase issues

Fix some whitespace issues and use the correct term "endpoint"
Add a tunable to disable ARI
Use a constant for the ARI version that we support