Code standard reviewed
Changed code according to code standard to prepare for a new pull request.