Minor documentation and code cleanup