Effects Rewrite: Style fixes