removed some redundant variable additions