Cleaned up api output