refactored class names, enhanced logging mechanism minor code cleanup and new artifact