Minor code formatting and refactoring
Merge branch 'master' of https://github.com/europeana/repox2.git