cleaning more code