Clean up variable declarations some more and start to work on for loops.