[PATCH] Char: istallion, variables cleanup