added card class, deleted static references