Cleanup collection syntax