JCR-2145: Code reformat