Add style fixes by PilzAdam