Starting to work on Octopussy CPAN package & code cleaning