Data dir is always set so we need to override if given a target location. Also formatting changes applied