Add per-module this; cleaned up a little