To be completley honest.. I think its fine the way it is, there are waaaay worse things to be looked at / worked on than even talking about Whitesmith card...
Lets work on classes first before we hit cards...
But if you want to hit cards first... Atroce card please.