Intermediate commit for code cleanup