PIM-2272: Clean code