[#835] Code cleanup and Employment API update