Small refactors (a spawn and exec were unneccessary, removed spawn)