PHOENIX-1362 code style fixes