restyle and improve commenting