all code according to code convention

all code according to code convention