save work: nicify structure and naming