@srowen 's java style suggestions.