#376 - final code corrections after review