Readying working tree for cleaner implementation