small cleanup - trying to reduce the could of '.' in statements.