Refactor code (mostly only idents)