Minor code cleanup

Minor java code cleanup