Post-rebase cleanup, de-lint and add some doc