clean up + streamline