Proper RTL and Refactor

This might also be
``` if (actor) ```
 to also catch ```null``` and similar problem values?