small refactor and added requirement for safariwatir in mac os

#369