Added cleanup, minor changes