use module and nicer variable name


please merge 2d617acb7662b6c4ce7a1244f091da88f427c3c6