spring data + code style fixes