fixed, cleaned, automized