some cleanup in variable assignation