remove return() calls, streamline returned values