Cleanup and commenting
Add Max dependencies (property of respective owners)