code cleanup (whitespace, redudant variable setting)