g_red_brick: Cleanup code and improve some variable names