Fix format and style based on pull request feedback