finn java style fixes, no functional changes