Content/data directory comes from configuration
Updated formatting