[bundle] Code sniffer cleanup