Furthur commenting cleanup