[dannunzio] Code clean-up