corrections to obey coding conventions