Minor comments and restyle