Modify codes to reduce checkstyle errors
Update