cleaned up cards scaffold