Services simple analyzer refactor

Please review, @devoncarew