Fixing variable name collisions
Fixing whitespace.