just some house cleaning to make the code more readable.