[cleanup] replace all nits