Remove commented stuff.
Renamed variables, remove unused variables.