Source reformat
Remove a few autoboxing