DATAREST-219: Polish up according to CONTRIBUTING.md