More variable cleanups

Signed-off-by: Fernando Barillas <fbis251@gmail.com>