Reviewed some variable definition.