Cleaned up calling methods.