Fixing formatting issues that came up in review