Merge pull request #1370 from hector-cortez/BUG-0000

BUG 0000 Adjustment for the standardization of code. CODE_STYLE
BUG 0000 Adjustment for the standardization of code. CODE_STYLE