Reduce java conversions garbage
Minor clean up