Fixed a few issue that didn't match the codind standards

Fixed a few issue that didn't match the codind standards

issue #3720