Cleaning junk
Undefined variable fix