Fix formatting suggesstions from PR