Refactored the auto-hierarchy support for the content file.
Removed the continue keywords, updated code flavor and corrected typos
as suggested. Refoctor codes for content files implementation.