Continuing with code cleanup.