changed coding conventions