#139 - code review & refactor ServiceContext

#139