Code cleaning for page module