Update for better Java style.