Code cleaning for setup