code cleanup in configuration module