Additional code reduction and closeness to original