Updated cardlist, removed comments