Updates for Java environment
Fix spacing issues