Clean up API.py
Fixed indentation
Fixed indentation to be consistent
More cleanup
Merge