More trailing whitespaces
Update java require statements