*little code cleanup