CLEANUP - checkstyle fix for platform

@dkincade, I had some time and I have resolved all the violations.
Could you review it?