Remove some trailing whitespace A bit of code simplification Change-Id: Iea96a2482c53868713a43569be4e5de4c9edb2a2
Also made file/class documentation more consistent. Change-Id: Ib21f42166ae0841e04c8af4fdcf59c0fa06f1738