Formatting
Refactor rename works
Instant rename working