Bring Blooper-Reel up to coding standards