code cleanup & comment additions, added custom exception class for use by Importer