A bunch of refactorings + added integration test for the delete method
Task #CON-18 - Bring down SonarQube technical debt by 10 days