improved code readability in litter module