IF cleanups