Made keyname one-liner more readable
Added cleanup script to be used following scenario