Cleanup of old comments, and style