some code cleanup in Module-1