Code sniffer, generator split

See #429