ENH clean up a bit of the code taking away some redundant calls