Turn off deprecated API.

Cleaned up indentation.