CONTENT-1627 - refactored fixing based on Code Review