Refactor + only check formatting on staged chunks