Braj/code standard

Code review changes