Cleanup: Wrong placed variable