continue my work on code cleanup