removed - not used variables.
minimal refact.