Cleaned up ending callout