Cleaning up code for other people to use always take 9 times as long as you think. Brooks, maybe?