Code styles PR fixes