clean up / streamline pointed stuff a bit