Made changes to bring to code in line to coding standards