Add java math and strictmath
Small style fixes