removed a couple extraneous bits