Make varaible names more explicit