Minor formatting changes from merge (#3)