This PR polishes a bit by simply applying the suggestions from https://github.com/spring-projects/spring-boot/commit/6ea2547de4dc9d6bc07b321be87df485132403c2#r110069933 and https://github.com/spring-projects/spring-boot/commit/6ea2547de4dc9d6bc07b321be87df485132403c2#r110069949.
Comment From: mhalbritter
Thanks!