Jeremy Newman : clean up