Add minor cleanup