minor coding convention violations corrected