streamline errors and naming