Perlito5 - code cleanup