Fixing style/standard's issues.