Some comments and minor style improvements