Everything fixed.

Removed unnecessary variables, cleaned the code up.