DATAES-2 - all code reformatted to follow Spring Data code rules