shrink header by moving as much to cpp

shrink header by moving as much to cpp #974