don't need this anymore
and cleaning up these args
small style changes