Made some style fixes

PT story IDs: 42383957, 42014649, 42383719, 42383895