#16 Clean up rtod module