cleaning more var names and methods