finalize indent refactor...