Made more variables private.