#10 applied formatting changes suggested by Francisco on e-mail