Cleanup if statement