bit more refactoring to content file