clean up more code