JCR-2094 :Reformat code