Refactor; https://github.com/WebSharks/s2member/issues/180

Refactor; https://github.com/WebSharks/s2member/issues/180