Added cleanup & removed need to run as root