cleaned things up considerably