Improve doc. and formatting.