Refact info class