did a bit of cleaning.
doing check for set vars