Merge pull request #5412 from JosJuice/small-boot-simplifications Boot: Small simplifications and formatting cleanup
