Style and doc fixes as requested by bos