Cleaned up a couple of effects