Tweak comments and doc strings