Removed **locals() magic