Reformatted after merge with pull request from @HmmmQuestionMark