Issue #4 - rewrite import - first batch of changes

[simon-20]

Some initial changes to begin the import rewriting.

Some docstrings added; function renaming for easier reading; line indentation in line with PEP 8; few other simplifications