Reformat code
Reformat code
Remove potential NPE