More refactoring, streamline a bit