comment & optimize