simplify, still looking for the best mix w.r.t file / code split