Add --replace-source-path option

Fix indentation

more formatting fixes