mo comments and better var names