Some cleanup
Fix missing variable