clean more code