Streamline a few things