Fix breakage introduced in modularity

Also removed some white-space lying around