Minor 'Best practice' refinements

The list of variables and libarys initialised has been improved
following best practice.