Cleaned up Root model a bit