Slight cleanup of API v2