code cleanup #01--Kalith