PIM-2961: Clean code