Modify codes according to CheckStyle's result