minor refactor of Content Module Index