Streamline doc ready process to avoid errors