Attempted further beautification