[Code Style] bin : Various changes
Merge pull request #4642 from marcodings/bin

[Code Style] bin : Various changes