lint tests and improve comments