fixed too many arguments bug and typo in cleanup