OAK-516: reformatted code