Cleanup plus a little work to meet RFC-002