cleaning code a bit.