made uniform indentation and added Mike's address
resolved script merge conflict