Eliminate unnecessary local variables. Close #32