add lzyload and cleanup comments