Style and speedup and dshape=None fixes

happy to change it