make dependency optional
remove unnecessary try..catch
remove "helper" suffixes