code cleanup. BASE