PIM-1631: Clean code for install command