Code reformatting.  Mostly just forcing the 'android-formatting'.

Some manual reformatting (adding white space for readability).