Increased set card size
Code cleanup