PIM-2382: Clean code