Code clean-up on sunlight init in chunk