Make use of kwargs
Get rid of vars()/locals() magic