first code cleanup