corrections to satisfy coding guidelines