Finalised related work refactoring