Auto code reformat, small fixes (cosmetic) to problems found by Android Studio Inspection tool.