cleaning up more code"