Cleaned up Card structure