PIM-2900: Clean code line
PIM-2900: Add specs