[cleanup] more comments + formatting