Remove some comments, minor style fixes