changed coding syle